DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: I7034032e2144139fadd4934a0a39a16adf3cda01